From 30c988711cbbd177c8f865347948565583de56db Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 12 Sep 2008 13:15:36 +0100
Subject: [PATCH] $(XEN_ROOT) absolutification fixes for ioemu-remote (incl
 stubdom)

 * Move code for generating an absolute version of XEN_ROOT
   into a common make variable set in Config.mk
 * Use this common code when invoking make -C ioemu-dir clean
   from tools/, which avoids a problem where `make clean' fails
   because qemu's (ioemu-remote's) build system wants to run
   `make clean' in `tests' but XEN_ROOT is a confection involving
   ../'s.
 * Use this common code in stubdom/Makefile, instead of $(abspath...)
   as the latter is a relatively new feature in GNU make and is not
   available in all the places that we want to be able to build
   (cf c/s 17997:3f23e01d31985899dbd1660b166f229f1ee74292)

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Config.mk        | 16 ++++++++++++++++
 stubdom/Makefile |  5 +++--
 tools/Makefile   |  9 +++------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Config.mk b/Config.mk
index 65f2de88ec..5976c2b9a7 100644
--- a/Config.mk
+++ b/Config.mk
@@ -54,6 +54,22 @@ define cc-ver-check-closure
     endif
 endef
 
+define absolutify_xen_root
+    case "$(XEN_ROOT)" in                                          \
+    /*) XEN_ROOT=$(XEN_ROOT) ;;                                    \
+    *)  xen_root_lhs=`pwd`;                                        \
+        xen_root_rhs=$(XEN_ROOT)/;                                 \
+        while [ "x$${xen_root_rhs#../}" != "x$$xen_root_rhs" ]; do \
+            xen_root_rhs="$${xen_root_rhs#../}";                   \
+            xen_root_rhs="$${xen_root_rhs#/}";                     \
+            xen_root_rhs="$${xen_root_rhs#/}";                     \
+            xen_root_lhs="$${xen_root_lhs%/*}";                    \
+        done;                                                      \
+        XEN_ROOT="$$xen_root_lhs/$$xen_root_rhs" ;;                \
+    esac;                                                          \
+    export XEN_ROOT
+endef
+
 ifeq ($(debug),y)
 CFLAGS += -g
 endif
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 74112c9b92..9bab6b4036 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -232,8 +232,9 @@ ifeq ($(CONFIG_QEMU),ioemu)
 	CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS=
 else
 	[ -f ioemu/config-host.mak ] || \
-	  ( cd ioemu ; \
-          CONFIG_STUBDOM=yes XEN_ROOT=$(abspath $(XEN_ROOT)) XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check $(IOEMU_OPTIONS))
+	  ( $(absolutify_xen_root); \
+	    cd ioemu ; \
+          CONFIG_STUBDOM=yes XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check $(IOEMU_OPTIONS))
 	CPPFLAGS= TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS= CONFIG_STUBDOM=yes
 endif
 
diff --git a/tools/Makefile b/tools/Makefile
index ed206deba6..71770a76ad 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -93,17 +93,14 @@ ioemu-dir-find:
 		ln -sf ioemu-remote ioemu-dir; \
 	fi
 	set -e; \
-		case "$(XEN_ROOT)" in \
-		/*)	XEN_ROOT=$(XEN_ROOT) ;; \
-		*)	XEN_ROOT=`pwd`/$(XEN_ROOT) ;; \
-		esac; \
-		export XEN_ROOT; \
+		$(absolutify_xen_root); \
 		cd ioemu-dir; \
 		./xen-setup $(IOEMU_CONFIGURE_CROSS)
 
 subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
 
 subdir-clean-ioemu-dir:
-	if test -d ioemu-dir/.; then \
+	set -e; if test -d ioemu-dir/.; then \
+		$(absolutify_xen_root); \
 		$(MAKE) -C ioemu-dir clean; \
 	fi
-- 
2.30.2